auto merge of #428 : garrison/cargo/patch-3, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 23 Aug 2014 18:29:10 +0000 (18:29 +0000)
committerbors <bors@rust-lang.org>
Sat, 23 Aug 2014 18:29:10 +0000 (18:29 +0000)
travis-ci now supports "language: rust", which eliminates the need to call rustup.sh in .travis.yml. See http://www.reddit.com/r/rust/comments/2ecocp/travis_ci_supports_rust/ for details.

This is the same change as #425, but on the master branch in guide.md, not guide.html.


Trivial merge